-
-
Notifications
You must be signed in to change notification settings - Fork 3.7k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
bevy_reflect: Fix combined field attributes #9322
Merged
alice-i-cecile
merged 2 commits into
bevyengine:main
from
MrGVSV:reflect-fix-multiple-field-attributes
Aug 7, 2023
Merged
bevy_reflect: Fix combined field attributes #9322
alice-i-cecile
merged 2 commits into
bevyengine:main
from
MrGVSV:reflect-fix-multiple-field-attributes
Aug 7, 2023
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
MrGVSV
added
C-Bug
An unexpected or incorrect behavior
A-Reflection
Runtime information about types
labels
Jul 31, 2023
MrGVSV
force-pushed
the
reflect-fix-multiple-field-attributes
branch
from
July 31, 2023 20:39
a727456
to
fa277e3
Compare
mockersf
reviewed
Jul 31, 2023
MrGVSV
force-pushed
the
reflect-fix-multiple-field-attributes
branch
from
July 31, 2023 20:53
fa277e3
to
3276660
Compare
nicopap
approved these changes
Aug 2, 2023
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
crates/bevy_reflect/bevy_reflect_derive/src/field_attributes.rs
Outdated
Show resolved
Hide resolved
mockersf
approved these changes
Aug 2, 2023
mockersf
added
the
S-Ready-For-Final-Review
This PR has been approved by the community. It's ready for a maintainer to consider merging it
label
Aug 2, 2023
cart
pushed a commit
that referenced
this pull request
Aug 10, 2023
# Objective It seems the behavior of field attributes was accidentally broken at some point. Take the following code: ```rust #[derive(Reflect)] struct Foo { #[reflect(ignore, default)] value: usize } ``` The above code should simply mark `value` as ignored and specify a default behavior. However, what this actually does is discard both. That's especially a problem when we don't want the field to be be given a `Reflect` or `FromReflect` bound (which is why we ignore it in the first place). This only happens when the attributes are combined into one. The following code works properly: ```rust #[derive(Reflect)] struct Foo { #[reflect(ignore)] #[reflect(default)] value: usize } ``` ## Solution Cleaned up the field attribute parsing logic to support combined field attributes. --- ## Changelog - Fixed a bug where `Reflect` derive attributes on fields are not able to be combined into a single attribute
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
A-Reflection
Runtime information about types
C-Bug
An unexpected or incorrect behavior
S-Ready-For-Final-Review
This PR has been approved by the community. It's ready for a maintainer to consider merging it
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Objective
It seems the behavior of field attributes was accidentally broken at some point. Take the following code:
The above code should simply mark
value
as ignored and specify a default behavior. However, what this actually does is discard both. That's especially a problem when we don't want the field to be be given aReflect
orFromReflect
bound (which is why we ignore it in the first place).This only happens when the attributes are combined into one. The following code works properly:
Solution
Cleaned up the field attribute parsing logic to support combined field attributes.
Changelog
Reflect
derive attributes on fields are not able to be combined into a single attribute